merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 28 Dec 2010 11:48:27 +0000 (20:48 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 28 Dec 2010 11:48:27 +0000 (20:48 +0900)
commit937a1e9615407e0556911b1c4b095146bfac7429
tree2d7160d421a703c8ff5bc5fe4deadfc0aafb62da
parentc2cad0f8debbebf0bedd47636a0a7c4a5f45264d
parent1102c2993ed6ce6cec12019259b9cd8429214352
merge trunk